| 
                
               | 
              
                
               | 
              
                @@ -13,19 +13,19 @@ from utils.tencentcloud.ess import (create_document, create_flow, create_scheme_ 
               | 
            
            
            
              | 
                13
               | 
              
                13
               | 
              
                                                     test_upload_document_files, upload_document_files) 
               | 
            
            
            
              | 
                14
               | 
              
                14
               | 
              
                  
               | 
            
            
            
              | 
                15
               | 
              
                15
               | 
              
                  
               | 
            
            
            
              | 
                16
               | 
              
                
               | 
              
                -# @logit(res=True) 
               | 
            
            
            
              | 
                
               | 
              
                16
               | 
              
                +@logit(res=True) 
               | 
            
            
            
              | 
                17
               | 
              
                17
               | 
              
                 def get_contribtion_contract_api(request): 
               | 
            
            
            
              | 
                18
               | 
              
                18
               | 
              
                     user_id = request.POST.get('user_id', '')
               | 
            
            
            
              | 
                19
               | 
              
                19
               | 
              
                     lensman_id = request.POST.get('lensman_id', '')
               | 
            
            
            
              | 
                20
               | 
              
                20
               | 
              
                     activity_id = request.POST.get('activity_id', '')
               | 
            
            
            
              | 
                21
               | 
              
                
               | 
              
                -    contribtuon_id = request.POST.get('contribtuon_id', '')
               | 
            
            
            
              | 
                
               | 
              
                21
               | 
              
                +    contribution_id = request.POST.get('contribution_id', '')
               | 
            
            
            
              | 
                22
               | 
              
                22
               | 
              
                  
               | 
            
            
            
              | 
                23
               | 
              
                23
               | 
              
                     lensman = LensmanInfo.objects.get(lensman_id=lensman_id) 
               | 
            
            
            
              | 
                24
               | 
              
                24
               | 
              
                  
               | 
            
            
            
              | 
                25
               | 
              
                25
               | 
              
                     contract, _ = LensmanContributionContractInfo.objects.update_or_create( 
               | 
            
            
            
              | 
                26
               | 
              
                
               | 
              
                -        user_id=user_id, lensman_id=lensman_id, activity_id=activity_id, contribtuon_id=contribtuon_id) 
               | 
            
            
            
              | 
                
               | 
              
                26
               | 
              
                +        user_id=user_id, lensman_id=lensman_id, activity_id=activity_id, contribution_id=contribution_id) 
               | 
            
            
            
              | 
                27
               | 
              
                27
               | 
              
                  
               | 
            
            
            
              | 
                28
               | 
              
                
               | 
              
                -    file_ids = upload_contribution_images(contribtuon_id) 
               | 
            
            
            
              | 
                
               | 
              
                28
               | 
              
                +    file_ids = upload_contribution_images(contribution_id) 
               | 
            
            
            
              | 
                29
               | 
              
                29
               | 
              
                  
               | 
            
            
            
              | 
                30
               | 
              
                30
               | 
              
                     operator = {
               | 
            
            
            
              | 
                31
               | 
              
                31
               | 
              
                         # "UserId": settings.CONTRACT_LENSMAN_CONTRIBUTION_OPERATOR_ID 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -51,10 +51,10 @@ def get_contribtion_contract_api(request): 
               | 
            
            
            
              | 
                51
               | 
              
                51
               | 
              
                     }) 
               | 
            
            
            
              | 
                52
               | 
              
                52
               | 
              
                  
               | 
            
            
            
              | 
                53
               | 
              
                53
               | 
              
                  
               | 
            
            
            
              | 
                54
               | 
              
                
               | 
              
                -def upload_contribution_images(contribtuon_id): 
               | 
            
            
            
              | 
                
               | 
              
                54
               | 
              
                +def upload_contribution_images(contribution_id): 
               | 
            
            
            
              | 
                55
               | 
              
                55
               | 
              
                     # 上传MemberActivityContributionInfo图片 https://qian.tencent.com/developers/companyApis/templatesAndFiles/UploadFiles 
               | 
            
            
            
              | 
                56
               | 
              
                56
               | 
              
                  
               | 
            
            
            
              | 
                57
               | 
              
                
               | 
              
                -    contribtuon = MemberActivityContributionInfo.objects.get(contribtuon_id=contribtuon_id) 
               | 
            
            
            
              | 
                
               | 
              
                57
               | 
              
                +    contribtuon = MemberActivityContributionInfo.objects.get(contribution_id=contribution_id) 
               | 
            
            
            
              | 
                58
               | 
              
                58
               | 
              
                  
               | 
            
            
            
              | 
                59
               | 
              
                59
               | 
              
                     # TODO: 从 MemberActivityContributionInfo 生成 files 对象 
               | 
            
            
            
              | 
                60
               | 
              
                60
               | 
              
                     files = [ 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -92,10 +92,10 @@ def create_contribution_contract_flow(lensman, Operator): 
               | 
            
            
            
              | 
                92
               | 
              
                92
               | 
              
                     return flow_id 
               | 
            
            
            
              | 
                93
               | 
              
                93
               | 
              
                  
               | 
            
            
            
              | 
                94
               | 
              
                94
               | 
              
                  
               | 
            
            
            
              | 
                95
               | 
              
                
               | 
              
                -def create_contribution_contract_document(lensman, contribtuon_id, file_ids, FlowId, Operator): 
               | 
            
            
            
              | 
                
               | 
              
                95
               | 
              
                +def create_contribution_contract_document(lensman, contribution_id, file_ids, FlowId, Operator): 
               | 
            
            
            
              | 
                96
               | 
              
                96
               | 
              
                     # 创建电子签文档 https://qian.tencent.com/developers/companyApis/startFlows/CreateDocument 
               | 
            
            
            
              | 
                97
               | 
              
                97
               | 
              
                  
               | 
            
            
            
              | 
                98
               | 
              
                
               | 
              
                -    income = LensmanContributionActivityIncomeExpensesInfo.objects.get(contribtuon_id=contribtuon_id, lensman_id=lensman.lensman_id) 
               | 
            
            
            
              | 
                
               | 
              
                98
               | 
              
                +    income = LensmanContributionActivityIncomeExpensesInfo.objects.get(contribution_id=contribution_id, lensman_id=lensman.lensman_id) 
               | 
            
            
            
              | 
                99
               | 
              
                99
               | 
              
                  
               | 
            
            
            
              | 
                100
               | 
              
                100
               | 
              
                     FormFields = [{
               | 
            
            
            
              | 
                101
               | 
              
                101
               | 
              
                         "ComponentId": "ComponentId_0", 
               |